build: Do not use `install` argument for configure_file()
authorEmmanuele Bassi <ebassi@gnome.org>
Fri, 29 Mar 2019 13:59:58 +0000 (13:59 +0000)
committerEmmanuele Bassi <ebassi@gnome.org>
Fri, 29 Mar 2019 14:30:57 +0000 (14:30 +0000)
The `install` argument for configure_file() was introduced in Meson
0.50, and was ignored in earlier versions.

Since we're still using Meson 0.48 as a baseline, and since it doesn't
cost us nothing to use a conditional in the only place where we used the
`install` argument, let's drop it. This avoids a warning in newer
releases of Meson.

testsuite/tools/meson.build

index f0cbb659486104823eeb16fee2e3e42e0b0d5bd2..74a79901a9e979db1a79fb97294494b154ec1ae8 100644 (file)
@@ -6,11 +6,16 @@ if bash.found()
   test_env = environment()
 
   foreach t : ['simplify', 'settings']
-    configure_file(output: t,
-                   input: '@0@.in'.format(t),
-                   copy: true,
-                   install: get_option('install-tests'),
-                   install_dir: testexecdir)
+    if get_option('install-tests')
+      configure_file(output: t,
+                     input: '@0@.in'.format(t),
+                     copy: true,
+                     install_dir: testexecdir)
+    else
+      configure_file(output: t,
+                     input: '@0@.in'.format(t),
+                     copy: true)
+    endif
     test(t, bash,
          args: t,
          workdir: meson.current_build_dir(),
@@ -35,7 +40,6 @@ if get_option('install-tests')
     configure_file(output: '@0@.test'.format(t),
                    input: 'tools.test.in',
                    configuration: test_conf,
-                   install: true,
                    install_dir: testdatadir)
   endforeach